Merge branch 'file-conflict2' into 'master'
authorBenjamin Otte <otte.benjamin@googlemail.com>
Tue, 2 Apr 2019 20:05:12 +0000 (20:05 +0000)
committerBenjamin Otte <otte.benjamin@googlemail.com>
Tue, 2 Apr 2019 20:05:12 +0000 (20:05 +0000)
commit0187e91843efcb8045ef4b281a0c78f6468d937f
tree8c4efcbacda2c5389b0b3751f6a4cbdc7db38dd6
parent7a08177a3d69389f3c17cbd2c9fb6aa0f9dccf0a
parent5c31c721af45a3cf884575c41c5e14899b3a0c08
Merge branch 'file-conflict2' into 'master'

Rename all settings schemas to avoid conflict

See merge request GNOME/gtk!705